stylecontext: Builtin images can be (and are) transformed
authorBenjamin Otte <otte@redhat.com>
Tue, 15 Dec 2015 15:03:25 +0000 (16:03 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 16 Dec 2015 00:50:00 +0000 (01:50 +0100)
So don't special-case them out.

gtk/gtkstylecontext.c

index 7e8c2a0f7d6aeb817aee19caf9aa74fe7919b26d..65ebe68697400e0ed9b1a42f28c30a06c971a66b 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcssenumvalueprivate.h"
-#include "gtkcssimagebuiltinprivate.h"
 #include "gtkcssimagevalueprivate.h"
 #include "gtkcssnodedeclarationprivate.h"
 #include "gtkcssnodeprivate.h"
@@ -3091,10 +3090,6 @@ _gtk_style_context_get_icon_extents (GtkStyleContext *context,
   extents->width = width;
   extents->height = height;
 
-  /* builtin images can't be transformed */
-  if (GTK_IS_CSS_IMAGE_BUILTIN (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)))
-    return;
-
   if (!_gtk_css_transform_value_get_matrix (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_TRANSFORM), &transform_matrix))
     return;